Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 14 Feb 2010 00:30:44 +0000 (00:30 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 14 Feb 2010 00:30:44 +0000 (00:30 +0000)

Trivial merge